# This is a BitKeeper generated diff -Nru style patch. # # ChangeSet # 2004/06/30 10:27:16-06:00 bjorn.helgaas@hp.com # Merge hp.com:/home/helgaas/linux/to-marcelo-2.4 # into hp.com:/home/helgaas/linux/linux-ia64-2.4 # # Makefile # 2004/06/30 10:27:14-06:00 bjorn.helgaas@hp.com +0 -0 # Auto merged # # ChangeSet # 2004/06/25 10:03:09-03:00 marcelo@logos.cnet # Changed EXTRAVERSION to -rc2 # TAG: v2.4.27-rc2 # # Makefile # 2004/06/25 10:02:38-03:00 marcelo@logos.cnet +1 -1 # Changed EXTRAVERSION to -rc2 # # ChangeSet # 2004/06/23 10:21:09-03:00 david-b@pacbell.net # [PATCH] usb gadget build updates (5/5) # # Kernel config and build updates to match the preceding patches: # CONFIG_USB_ETH_RNDIS option for USB_ETH, and links epautoconf # to the drivers using that library code. # # drivers/usb/gadget/Makefile # 2004/06/23 03:03:50-03:00 david-b@pacbell.net +7 -3 # usb gadget build updates (5/5) # # drivers/usb/gadget/Config.in # 2004/06/20 20:29:31-03:00 david-b@pacbell.net +3 -0 # usb gadget build updates (5/5) # # ChangeSet # 2004/06/23 10:18:04-03:00 david-b@pacbell.net # [PATCH] usb ethernet+RNDIS gadget updates (4/5) # # Brings the ethernet gadget into sync with the 2.6 code, including RNDIS. # # - RNDIS code contributed by Pengutronix, merged by me, and including # bugfixes and patches from lots of folk. This is a very useful update # to this driver, since Windows XP bundles RNDIS support. # # - Converts to use the new endpoint autoconfig library code. This makes # it a lot simpler to run this on new hardware ... no more static config. # # - Can now pass desired ethernet addresses as a module parameter, so it's # easier to manage these like "normal ethernet" links (with idproms). # # - Hardly any other changes, other than minor sparse updates. # # drivers/usb/gadget/rndis.h # 2004/06/20 18:01:15-03:00 david-b@pacbell.net +348 -0 # usb ethernet+RNDIS gadget updates (4/5) # # drivers/usb/gadget/rndis.c # 2004/06/20 18:01:14-03:00 david-b@pacbell.net +1426 -0 # usb ethernet+RNDIS gadget updates (4/5) # # drivers/usb/gadget/ndis.h # 2004/06/20 18:01:15-03:00 david-b@pacbell.net +217 -0 # usb ethernet+RNDIS gadget updates (4/5) # # drivers/usb/gadget/rndis.h # 2004/06/20 18:01:15-03:00 david-b@pacbell.net +0 -0 # BitKeeper file /home/marcelo/bk/linux-2.4/drivers/usb/gadget/rndis.h # # drivers/usb/gadget/rndis.c # 2004/06/20 18:01:14-03:00 david-b@pacbell.net +0 -0 # BitKeeper file /home/marcelo/bk/linux-2.4/drivers/usb/gadget/rndis.c # # drivers/usb/gadget/ndis.h # 2004/06/20 18:01:15-03:00 david-b@pacbell.net +0 -0 # BitKeeper file /home/marcelo/bk/linux-2.4/drivers/usb/gadget/ndis.h # # drivers/usb/gadget/ether.c # 2004/06/20 18:01:15-03:00 david-b@pacbell.net +1143 -424 # usb ethernet+RNDIS gadget updates (4/5) # # ChangeSet # 2004/06/23 10:13:51-03:00 david-b@pacbell.net # [PATCH] usb file storage gadget updates (3/5) # # Brings the file_storage gadget more into sync with the 2.6 code: # # - Converts to use the new endpoint autoconfig library code. This makes # it a lot simpler to run this on new hardware ... less static config. # # - Converts to use a table of configuration descriptors (library code) # instead of doing that programmatically. # # - Some bugfixes, including support for big-endian hosts and reporting # the correct sense length. # # All of this is from Alan Stern. # # drivers/usb/gadget/file_storage.c # 2004/06/20 18:01:15-03:00 david-b@pacbell.net +172 -280 # usb file storage gadget updates (3/5) # # ChangeSet # 2004/06/23 10:13:06-03:00 david-b@pacbell.net # [PATCH] usb gadget zero updates (2/5) # # Brings the Gadget Zero more into sync with the 2.6 code: # # - Converts to use the new endpoint autoconfig library code. This makes # it a lot simpler to run this on new hardware ... less static config. # On all sane hardware, it doesn't actually require ANY static config, # except to avoid the "what hardware is this?" message. # # - Adds "autoresume" mode, handy when testing USB suspend/resume, and # remote wakeup. # # - Stop using DEBUG as a file-private #define; use DBG instead. # # drivers/usb/gadget/zero.c # 2004/06/20 18:01:15-03:00 david-b@pacbell.net +156 -121 # usb gadget zero updates (2/5) # # ChangeSet # 2004/06/23 10:12:31-03:00 david-b@pacbell.net # [PATCH] usb gadget API updates (1/5) # # Brings the gadget library code into sync with the 2.6 code. # # The main change is adding new "endpoint autoconfig" library calls, which # can eliminate most of the changes that would otherwise be needed when # running this API on new hardware ... each controller will usually set its # endpoints up differently. # # include/linux/usb_gadget.h # 2004/06/20 18:01:15-03:00 david-b@pacbell.net +9 -0 # usb gadget API updates (1/5) # # include/linux/usb_ch9.h # 2004/06/20 18:01:15-03:00 david-b@pacbell.net +14 -0 # usb gadget API updates (1/5) # # drivers/usb/gadget/usbstring.c # 2004/06/20 18:01:15-03:00 david-b@pacbell.net +2 -1 # usb gadget API updates (1/5) # # drivers/usb/gadget/gadget_chips.h # 2004/06/20 18:01:13-03:00 david-b@pacbell.net +7 -1 # usb gadget API updates (1/5) # # drivers/usb/gadget/epautoconf.c # 2004/06/20 18:01:14-03:00 david-b@pacbell.net +308 -0 # usb gadget API updates (1/5) # # drivers/usb/gadget/epautoconf.c # 2004/06/20 18:01:14-03:00 david-b@pacbell.net +0 -0 # BitKeeper file /home/marcelo/bk/linux-2.4/drivers/usb/gadget/epautoconf.c # # ChangeSet # 2004/06/23 09:26:37-03:00 Matt_Domsch@dell.com # [PATCH] edd.c display %u, remove REPORT_URL # # This removes the REPORT_URL string and message telling people to send me # their BIOS info. I've got a huge number of reports, and virtually all # show that EDD 3.0 is not supported, or if supported, is likely implemented # in ways contrary to the spec. In 2.7.x I may bring the REPORT_URL back once # I've got a better way to track the data being sent to me. # # Also, this now reports the EDD geometry (if known) and number of # sectors using %u instead of %x, to be consistent with what is in 2.6.7 # now. # # arch/i386/kernel/edd.c # 2004/06/21 17:41:01-03:00 Matt_Domsch@dell.com +5 -10 # edd.c display %u, remove REPORT_URL # # ChangeSet # 2004/06/23 09:20:50-03:00 marcelo@logos.cnet # Al Viro sparse fixes: asus_acpi user pointer dereference # # drivers/acpi/asus_acpi.c # 2004/06/18 23:44:13-03:00 marcelo@logos.cnet +34 -12 # Import patch acpi.solar # # ChangeSet # 2004/06/23 09:14:50-03:00 marcelo@logos.cnet # Al Viro sparse fixes: aironet # # drivers/net/wireless/airo.c # 2004/06/16 02:34:27-03:00 marcelo@logos.cnet +27 -24 # Import patch airo-fix # # ChangeSet # 2004/06/23 09:13:13-03:00 marcelo@logos.cnet # Al Viro sparse fixes: pss user pointer dereference # # drivers/sound/pss.c # 2004/06/16 00:31:33-03:00 marcelo@logos.cnet +63 -29 # Import patch pss-fix # # ChangeSet # 2004/06/23 09:11:47-03:00 marcelo@logos.cnet # Al Viro sparse fixes: msnd user pointer dereference & assorted fixes # # drivers/sound/msnd_pinnacle.c # 2004/06/16 02:42:11-03:00 marcelo@logos.cnet +56 -32 # Import patch msnd-fix # # drivers/sound/msnd.h # 2004/06/16 02:42:26-03:00 marcelo@logos.cnet +2 -2 # Import patch msnd-fix # # drivers/sound/msnd.c # 2004/06/16 02:42:38-03:00 marcelo@logos.cnet +4 -18 # Import patch msnd-fix # # ChangeSet # 2004/06/23 09:09:39-03:00 marcelo@logos.cnet # Al Viro sparse fixes: mpu401 user pointer dereference # # drivers/sound/mpu401.c # 2004/06/16 00:07:29-03:00 marcelo@logos.cnet +28 -11 # Import patch mpu401-fix # # ChangeSet # 2004/06/23 09:08:01-03:00 marcelo@logos.cnet # Al Viro sparse fixes: decnet user pointer dereference # # net/decnet/dn_dev.c # 2004/06/15 23:54:14-03:00 marcelo@logos.cnet +15 -7 # Import patch decnet-fix # # ChangeSet # 2004/06/23 15:55:15+10:00 nathans@sgi.com # [XFS] Fix up memory reclaim interfaces for 2.4 kernels. # # Signed-off-by: nathans@sgi.com # # fs/xfs/linux-2.4/kmem.h # 2004/06/23 15:55:09+10:00 nathans@sgi.com +1 -2 # [XFS] Fix up memory reclaim interfaces for 2.4 kernels. # # fs/xfs/linux-2.4/kmem.c # 2004/06/23 15:55:09+10:00 nathans@sgi.com +50 -12 # [XFS] Fix up memory reclaim interfaces for 2.4 kernels. # # ChangeSet # 2004/06/21 14:51:11-07:00 shemminger@osdl.org # [BRIDGE]: Elimintate br_ioctl_mutex # # The bridge code doesn't need a separate ioctl, mutex it can just # use the existing RTNL mechanism. This avoids some races and deadlocks # on shutdown. # # This is for 2.4; a similar mechanism has been in 2.6 for some time. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/bridge/br_private.h # 2004/06/21 14:51:07-07:00 shemminger@osdl.org +0 -1 # [BRIDGE]: Elimintate br_ioctl_mutex # # The bridge code doesn't need a separate ioctl, mutex it can just # use the existing RTNL mechanism. This avoids some races and deadlocks # on shutdown. # # This is for 2.4; a similar mechanism has been in 2.6 for some time. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/bridge/br_ioctl.c # 2004/06/21 14:51:07-07:00 shemminger@osdl.org +4 -18 # [BRIDGE]: Elimintate br_ioctl_mutex # # The bridge code doesn't need a separate ioctl, mutex it can just # use the existing RTNL mechanism. This avoids some races and deadlocks # on shutdown. # # This is for 2.4; a similar mechanism has been in 2.6 for some time. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/bridge/br.c # 2004/06/21 14:51:07-07:00 shemminger@osdl.org +5 -6 # [BRIDGE]: Elimintate br_ioctl_mutex # # The bridge code doesn't need a separate ioctl, mutex it can just # use the existing RTNL mechanism. This avoids some races and deadlocks # on shutdown. # # This is for 2.4; a similar mechanism has been in 2.6 for some time. # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:50:38-07:00 shemminger@osdl.org # [BRIDGE]: Backport of API checking. # # This adds the checks in 2.6 for invalid ether # and deleting wrong bridge port to 2.4.27 (from Erich Schubert) # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # net/bridge/br_if.c # 2004/06/21 14:50:34-07:00 shemminger@osdl.org +5 -1 # [BRIDGE]: Backport of API checking. # # This adds the checks in 2.6 for invalid ether # and deleting wrong bridge port to 2.4.27 (from Erich Schubert) # # Signed-off-by: Stephen Hemminger # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:21:21-07:00 laforge@netfilter.org # [NETFILTER]: Add new function 'nf_reset' to reset netfilter related skb-fields # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv6/sit.c # 2004/06/21 14:21:17-07:00 laforge@netfilter.org +2 -14 # [NETFILTER]: Add new function 'nf_reset' to reset netfilter related skb-fields # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ipt_REJECT.c # 2004/06/21 14:21:17-07:00 laforge@netfilter.org +1 -5 # [NETFILTER]: Add new function 'nf_reset' to reset netfilter related skb-fields # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/ipmr.c # 2004/06/21 14:21:17-07:00 laforge@netfilter.org +3 -12 # [NETFILTER]: Add new function 'nf_reset' to reset netfilter related skb-fields # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/ipip.c # 2004/06/21 14:21:17-07:00 laforge@netfilter.org +2 -14 # [NETFILTER]: Add new function 'nf_reset' to reset netfilter related skb-fields # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/ip_input.c # 2004/06/21 14:21:17-07:00 laforge@netfilter.org +1 -4 # [NETFILTER]: Add new function 'nf_reset' to reset netfilter related skb-fields # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/ip_gre.c # 2004/06/21 14:21:17-07:00 laforge@netfilter.org +2 -14 # [NETFILTER]: Add new function 'nf_reset' to reset netfilter related skb-fields # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # include/linux/skbuff.h # 2004/06/21 14:21:17-07:00 laforge@netfilter.org +11 -0 # [NETFILTER]: Add new function 'nf_reset' to reset netfilter related skb-fields # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:20:51-07:00 laforge@netfilter.org # [NETFILTER]: Remove broken check for cleared IP_DF flag on fragments in ipt_unclean # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ipt_unclean.c # 2004/06/21 14:20:47-07:00 laforge@netfilter.org +0 -8 # [NETFILTER]: Remove broken check for cleared IP_DF flag on fragments in ipt_unclean # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:19:48-07:00 laforge@netfilter.org # [NETFILTER]: Fix truncated fragment check in ipt_unclean # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ipt_unclean.c # 2004/06/21 14:19:44-07:00 laforge@netfilter.org +2 -3 # [NETFILTER]: Fix truncated fragment check in ipt_unclean # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:19:20-07:00 laforge@netfilter.org # [NETFILTER]: Don't reroute on nfmark change in mangle table when routing by nfmark is not enabled # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/iptable_mangle.c # 2004/06/21 14:19:17-07:00 laforge@netfilter.org +2 -0 # [NETFILTER]: Don't reroute on nfmark change in mangle table when routing by nfmark is not enabled # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:18:48-07:00 laforge@netfilter.org # [NETFILTER]: 'any' matching in ipt_helper # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ipt_helper.c # 2004/06/21 14:18:44-07:00 laforge@netfilter.org +5 -6 # [NETFILTER]: 'any' matching in ipt_helper # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:18:10-07:00 laforge@netfilter.org # [NETFILTER]: Fix inverted matching in ipt_helper # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ipt_helper.c # 2004/06/21 14:18:06-07:00 laforge@netfilter.org +5 -5 # [NETFILTER]: Fix inverted matching in ipt_helper # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:17:40-07:00 laforge@netfilter.org # [NETFILTER]: skip internal targets in iptables proc listing # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv6/netfilter/ip6_tables.c # 2004/06/21 14:17:36-07:00 laforge@netfilter.org +10 -1 # [NETFILTER]: skip internal targets in iptables proc listing # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ip_tables.c # 2004/06/21 14:17:36-07:00 laforge@netfilter.org +10 -1 # [NETFILTER]: skip internal targets in iptables proc listing # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:17:01-07:00 laforge@netfilter.org # [NETFILTER]: Change permissions of /proc/net/ip_conntrack to 0440 # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ip_conntrack_standalone.c # 2004/06/21 14:16:57-07:00 laforge@netfilter.org +1 -1 # [NETFILTER]: Change permissions of /proc/net/ip_conntrack to 0440 # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:16:16-07:00 laforge@netfilter.org # [NETFILTER]: Complain when broken ipt_owner options are used on SMP. # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv6/netfilter/ip6t_owner.c # 2004/06/21 14:16:12-07:00 laforge@netfilter.org +8 -1 # [NETFILTER]: Complain when broken ipt_owner options are used on SMP. # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ipt_owner.c # 2004/06/21 14:16:12-07:00 laforge@netfilter.org +9 -1 # [NETFILTER]: Complain when broken ipt_owner options are used on SMP. # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/21 14:15:37-07:00 laforge@netfilter.org # [NETFILTER]: Fix non-existant config option. # # This patch for 2.4 fixes a non-existant config option (CONFIG_NF_DEBUG) # for IP_NF_ASSERT and fixes a couple of broken assertions. # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ip_nat_core.c # 2004/06/21 14:15:33-07:00 laforge@netfilter.org +5 -2 # [NETFILTER]: Fix non-existant config option. # # This patch for 2.4 fixes a non-existant config option (CONFIG_NF_DEBUG) # for IP_NF_ASSERT and fixes a couple of broken assertions. # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # net/ipv4/netfilter/ip_conntrack_core.c # 2004/06/21 14:15:33-07:00 laforge@netfilter.org +2 -5 # [NETFILTER]: Fix non-existant config option. # # This patch for 2.4 fixes a non-existant config option (CONFIG_NF_DEBUG) # for IP_NF_ASSERT and fixes a couple of broken assertions. # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # include/linux/netfilter_ipv4/ip_conntrack.h # 2004/06/21 14:15:33-07:00 laforge@netfilter.org +1 -1 # [NETFILTER]: Fix non-existant config option. # # This patch for 2.4 fixes a non-existant config option (CONFIG_NF_DEBUG) # for IP_NF_ASSERT and fixes a couple of broken assertions. # # Signed-off-by: Harald Welte # Signed-off-by: David S. Miller # # ChangeSet # 2004/06/18 14:09:37+10:00 nathans@sgi.com # [XFS] Fix up error handling on inode shrink register. # # SGI Modid: xfs-linux:xfs-kern:173764a # Signed-off-by: nathans@sgi.com # # fs/xfs/linux-2.4/xfs_super.c # 2004/06/18 14:09:30+10:00 nathans@sgi.com +10 -0 # [XFS] Fix up error handling on inode shrink register. # # ChangeSet # 2004/06/18 13:56:33+10:00 cattelan@sgi.com # [XFS] Fix for NFS+XFS data corruption problem. # See http://oss.sgi.com/bugzilla/show_bug.cgi?id=198 for full details. # # SGI Modid: xfs-linux:xfs-kern:173598a # Signed-off-by: nathans@sgi.com # # fs/xfs/linux-2.4/xfs_aops.c # 2004/06/18 13:56:25+10:00 cattelan@sgi.com +19 -9 # [XFS] Fix for NFS+XFS data corruption problem. # See http://oss.sgi.com/bugzilla/show_bug.cgi?id=198 for full details. # # ChangeSet # 2004/06/18 12:08:11+10:00 nathans@sgi.com # [XFS] Fix up memory allocators to be more resilient. # # SGI Modid: xfs-linux:xfs-kern:173571a # Signed-off-by: nathans@sgi.com # # fs/xfs/linux-2.4/xfs_super.c # 2004/06/18 12:08:05+10:00 nathans@sgi.com +19 -7 # [XFS] Fix up memory allocators to be more resilient. # # fs/xfs/linux-2.4/xfs_buf.h # 2004/06/18 12:08:05+10:00 nathans@sgi.com +0 -1 # [XFS] Fix up memory allocators to be more resilient. # # fs/xfs/linux-2.4/xfs_buf.c # 2004/06/18 12:08:04+10:00 nathans@sgi.com +38 -38 # [XFS] Fix up memory allocators to be more resilient. # # fs/xfs/linux-2.4/kmem.h # 2004/06/18 12:08:04+10:00 nathans@sgi.com +34 -5 # [XFS] Fix up memory allocators to be more resilient. # # fs/xfs/linux-2.4/kmem.c # 2004/06/18 12:08:04+10:00 nathans@sgi.com +45 -142 # [XFS] Fix up memory allocators to be more resilient. # # ChangeSet # 2004/06/18 11:53:21+10:00 nathans@sgi.com # [XFS] Fix a race condition in the undo-delayed-write buffer routine. # # SGI Modid: xfs-linux:xfs-kern:173564a # Signed-off-by: nathans@sgi.com # # fs/xfs/linux-2.4/xfs_buf.h # 2004/06/18 11:53:08+10:00 nathans@sgi.com +4 -16 # [XFS] Fix a race condition in the undo-delayed-write buffer routine. # # fs/xfs/linux-2.4/xfs_buf.c # 2004/06/18 11:53:07+10:00 nathans@sgi.com +10 -3 # [XFS] Fix a race condition in the undo-delayed-write buffer routine. # # ChangeSet # 2004/06/18 11:47:39+10:00 nathans@sgi.com # [XFS] Fix flags argument to xfs_incore call on attr removal. # # SGI Modid: xfs-linux:xfs-kern:173563a # Signed-off-by: nathans@sgi.com # # fs/xfs/xfs_attr.c # 2004/06/18 11:47:32+10:00 nathans@sgi.com +3 -3 # [XFS] Fix flags argument to xfs_incore call on attr removal. # # ChangeSet # 2004/06/18 11:43:49+10:00 nathans@sgi.com # [XFS] Remove the one remaining, broken use of XFS_WRITEIO_LOG and # sanitize direct IO map blocks call. # # SGI Modid: xfs-linux:xfs-kern:173562a # Signed-off-by: nathans@sgi.com # # fs/xfs/xfs_mount.h # 2004/06/18 11:43:42+10:00 nathans@sgi.com +1 -5 # [XFS] Remove the one remaining, broken use of XFS_WRITEIO_LOG and # sanitize direct IO map blocks call. # # fs/xfs/linux-2.4/xfs_aops.c # 2004/06/18 11:43:42+10:00 nathans@sgi.com +25 -22 # [XFS] Remove the one remaining, broken use of XFS_WRITEIO_LOG and # sanitize direct IO map blocks call. # # ChangeSet # 2004/06/18 10:59:23+10:00 nathans@sgi.com # [XFS] Remove unused MAC macros, never needed on Linux. # # SGI Modid: xfs-linux:xfs-kern:173561a # Signed-off-by: nathans@sgi.com # # fs/xfs/xfs_vnodeops.c # 2004/06/18 10:59:16+10:00 nathans@sgi.com +0 -16 # [XFS] Remove unused MAC macros, never needed on Linux. # # fs/xfs/xfs_inode.c # 2004/06/18 10:59:16+10:00 nathans@sgi.com +0 -6 # [XFS] Remove unused MAC macros, never needed on Linux. # # fs/xfs/xfs_acl.c # 2004/06/18 10:59:16+10:00 nathans@sgi.com +0 -4 # [XFS] Remove unused MAC macros, never needed on Linux. # # ChangeSet # 2004/06/18 10:52:40+10:00 nathans@sgi.com # [XFS] Sanitise the ACL initialisation macros. # # SGI Modid: xfs-linux:xfs-kern:173559a # Signed-off-by: nathans@sgi.com # # fs/xfs/xfs_vfsops.c # 2004/06/18 10:52:33+10:00 nathans@sgi.com +2 -2 # [XFS] Sanitise the ACL initialisation macros. # # fs/xfs/xfs_acl.h # 2004/06/18 10:52:33+10:00 nathans@sgi.com +11 -15 # [XFS] Sanitise the ACL initialisation macros. # # ChangeSet # 2004/06/18 10:49:18+10:00 nathans@sgi.com # [XFS] Ensure buffers that map to unwritten extents are only submitted # when properly setup. # # SGI Modid: xfs-linux:xfs-kern:173555a # Signed-off-by: nathans@sgi.com # # fs/xfs/linux-2.4/xfs_aops.c # 2004/06/18 10:49:12+10:00 nathans@sgi.com +7 -2 # [XFS] Ensure buffers that map to unwritten extents are only submitted # when properly setup. # # ChangeSet # 2004/06/18 10:43:14+10:00 roehrich@sgi.com # [XFS] Fix non-dmapi build # # SGI Modid: xfs-linux:xfs-kern:173222a # Signed-off-by: nathans@sgi.com # # fs/xfs/xfs_dmapi.h # 2004/06/18 10:43:08+10:00 roehrich@sgi.com +2 -2 # [XFS] Fix non-dmapi build # # ChangeSet # 2004/06/18 10:39:30+10:00 roehrich@sgi.com # [XFS] Change things to use new version of xfs_dm_init/xfs_dm_exit # # SGI Modid: xfs-linux:xfs-kern:173206a # Signed-off-by: nathans@sgi.com # # fs/xfs/xfs_dmapi.h # 2004/06/18 10:39:24+10:00 roehrich@sgi.com +10 -3 # [XFS] Change things to use new version of xfs_dm_init/xfs_dm_exit # # fs/xfs/linux-2.4/xfs_super.h # 2004/06/18 10:39:24+10:00 roehrich@sgi.com +8 -1 # [XFS] Change things to use new version of xfs_dm_init/xfs_dm_exit # # fs/xfs/linux-2.4/xfs_super.c # 2004/06/18 10:39:24+10:00 roehrich@sgi.com +2 -0 # [XFS] Change things to use new version of xfs_dm_init/xfs_dm_exit # # ChangeSet # 2004/06/18 10:17:07+10:00 nathans@sgi.com # [XFS] sparse: fix uses of macros before their definitions, etc. # # SGI Modid: xfs-linux:xfs-kern:173194a # Signed-off-by: nathans@sgi.com # # fs/xfs/xfs_arch.h # 2004/06/18 10:17:01+10:00 nathans@sgi.com +5 -5 # [XFS] sparse: fix uses of macros before their definitions, etc. # # fs/xfs/xfs.h # 2004/06/18 10:17:00+10:00 nathans@sgi.com +1 -0 # [XFS] sparse: fix uses of macros before their definitions, etc. # # fs/xfs/linux-2.4/xfs_fs_subr.c # 2004/06/18 10:17:00+10:00 nathans@sgi.com +3 -3 # [XFS] sparse: fix uses of macros before their definitions, etc. # # fs/xfs/linux-2.4/kmem.h # 2004/06/18 10:17:00+10:00 nathans@sgi.com +1 -1 # [XFS] sparse: fix uses of macros before their definitions, etc. # # ChangeSet # 2004/06/18 10:09:21+10:00 nathans@sgi.com # [XFS] Fix xfs_lowbit64, it mishandled zero in the high bits. # Cleanup a couple of other ffs users, since ffs(0) is apparently # undefined on some architectures. # # SGI Modid: xfs-linux:xfs-kern:173034a # Signed-off-by: nathans@sgi.com # # fs/xfs/xfs_rtalloc.c # 2004/06/18 10:09:15+10:00 nathans@sgi.com +4 -2 # [XFS] Fix xfs_lowbit64, it mishandled zero in the high bits. # Cleanup a couple of other ffs users, since ffs(0) is apparently # undefined on some architectures. # # fs/xfs/xfs_bit.c # 2004/06/18 10:09:15+10:00 nathans@sgi.com +14 -10 # [XFS] Fix xfs_lowbit64, it mishandled zero in the high bits. # Cleanup a couple of other ffs users, since ffs(0) is apparently # undefined on some architectures. # # ChangeSet # 2004/06/18 10:04:27+10:00 nathans@sgi.com # [XFS] Remove a couple of redundant NULL parent inode pointer checks. # # SGI Modid: xfs-linux:xfs-kern:173033a # Signed-off-by: nathans@sgi.com # # fs/xfs/xfs_inode.h # 2004/06/18 10:04:20+10:00 nathans@sgi.com +2 -2 # [XFS] Remove a couple of redundant NULL parent inode pointer checks. # # fs/xfs/xfs_inode.c # 2004/06/18 10:04:20+10:00 nathans@sgi.com +1 -2 # [XFS] Remove a couple of redundant NULL parent inode pointer checks. # # ChangeSet # 2004/06/18 09:45:16+10:00 nathans@sgi.com # [XFS] No longer hold the BKL for the entire ioctl operation, # its not needed here. # # SGI Modid: xfs-linux:xfs-kern:173032a # Signed-off-by: nathans@sgi.com # # fs/xfs/linux-2.4/xfs_file.c # 2004/06/18 09:45:08+10:00 nathans@sgi.com +6 -3 # [XFS] No longer hold the BKL for the entire ioctl operation, # its not needed here. # # ChangeSet # 2004/05/28 11:45:27+10:00 hch@sgi.com # [XFS] Don't leak locked pages on readahead failure # # SGI Modid: xfs-linux:xfs-kern:172618a # # fs/xfs/linux-2.4/xfs_buf.c # 2004/05/28 11:45:19+10:00 hch@sgi.com +6 -3 # [XFS] Don't leak locked pages on readahead failure # # ChangeSet # 2004/05/28 11:42:41+10:00 sandeen@sgi.com # [XFS] Fix overflow in mapping test at offsets of 2^63-1 bytes # # SGI Modid: xfs-linux:xfs-kern:172649a # # fs/xfs/linux-2.4/xfs_aops.c # 2004/05/28 11:42:34+10:00 sandeen@sgi.com +1 -1 # [XFS] Fix overflow in mapping test at offsets of 2^63-1 bytes # diff -Nru a/Makefile b/Makefile --- a/Makefile 2004-07-14 15:22:19 -07:00 +++ b/Makefile 2004-07-14 15:22:19 -07:00 @@ -93,6 +93,7 @@ CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \ -fno-strict-aliasing -fno-common +CFLAGS += -g ifndef CONFIG_FRAME_POINTER CFLAGS += -fomit-frame-pointer endif @@ -307,8 +308,7 @@ $(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in xconfig: symlinks - $(MAKE) -C scripts kconfig.tk - wish -f scripts/kconfig.tk + @echo -e "***\n* Sorry, xconfig is broken; use \"make menuconfig\" instead.\n***" menuconfig: include/linux/version.h symlinks $(MAKE) -C scripts/lxdialog all